Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[19773] Rework log upon receiver resource creation failure (backport #3954) #3956

Closed
wants to merge 1 commit into from
Closed

[19773] Rework log upon receiver resource creation failure (backport #3954) #3956

wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 24, 2023

This is an automatic backport of pull request #3954 done by Mergify.
Cherry-pick of 63c4150 has failed:

On branch mergify/bp/2.10.x/pr-3954
Your branch is up to date with 'origin/2.10.x'.

You are currently cherry-picking commit 63c415072.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   src/cpp/rtps/participant/RTPSParticipantImpl.h

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/cpp/rtps/participant/RTPSParticipantImpl.cpp

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@MiguelCompany @mergify
Rework log upon receiver resource creation failure (#3954)
adf3585 
* Refs #19773. Turn log error into a log warning.

Signed-off-by: Miguel Company <[email protected]>

* Refs #19773. Add boolean argument to `createReceiverResources`.

Signed-off-by: Miguel Company <[email protected]>

---------

Signed-off-by: Miguel Company <[email protected]>
(cherry picked from commit 63c4150)

# Conflicts:
#	src/cpp/rtps/participant/RTPSParticipantImpl.cpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Oct 24, 2023
@mergify mergify bot mentioned this pull request Oct 24, 2023
Merged
10 tasks
@fujitatomoya fujitatomoya mentioned this pull request Oct 24, 2023
Closed
@JLBuenoLopez JLBuenoLopez added this to the v2.10.3 milestone Oct 25, 2023
@MiguelCompany
Copy link
Member

Closing in favor of #3937

@MiguelCompany MiguelCompany deleted the mergify/bp/2.10.x/pr-3954 branch October 25, 2023 10:39
@EduPonz EduPonz removed the conflicts Backport PR wich git cherry pick failed label Dec 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fujitatomoya fujitatomoya fujitatomoya left review comments

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
v2.10.3
Development

Successfully merging this pull request may close these issues.
4 participants
@MiguelCompany @fujitatomoya @EduPonz @JLBuenoLopez